From 836953b5bac27ad61d4e82111524be3c2c984476 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Feb 2004 00:49:50 +0000 Subject: [PATCH] Fix the drawing of tearoff menu items which don't come first in their Thu Feb 5 01:50:19 2004 Matthias Clasen * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix the drawing of tearoff menu items which don't come first in their menu. (#33311) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktearoffmenuitem.c | 4 ++-- 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e12f2e1d8..c0b7093b35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 5 01:50:19 2004 Matthias Clasen + + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix + the drawing of tearoff menu items which don't come first in their + menu. (#33311) + Thu Feb 5 00:59:08 2004 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e12f2e1d8..c0b7093b35 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Feb 5 01:50:19 2004 Matthias Clasen + + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix + the drawing of tearoff menu items which don't come first in their + menu. (#33311) + Thu Feb 5 00:59:08 2004 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e12f2e1d8..c0b7093b35 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Feb 5 01:50:19 2004 Matthias Clasen + + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix + the drawing of tearoff menu items which don't come first in their + menu. (#33311) + Thu Feb 5 00:59:08 2004 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e12f2e1d8..c0b7093b35 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Feb 5 01:50:19 2004 Matthias Clasen + + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix + the drawing of tearoff menu items which don't come first in their + menu. (#33311) + Thu Feb 5 00:59:08 2004 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e12f2e1d8..c0b7093b35 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Feb 5 01:50:19 2004 Matthias Clasen + + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix + the drawing of tearoff menu items which don't come first in their + menu. (#33311) + Thu Feb 5 00:59:08 2004 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index fce5fd7068..1a2609eefa 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -144,8 +144,8 @@ gtk_tearoff_menu_item_paint (GtkWidget *widget, x = widget->allocation.x + GTK_CONTAINER (menu_item)->border_width; y = widget->allocation.y + GTK_CONTAINER (menu_item)->border_width; - width = widget->allocation.width - x * 2; - height = widget->allocation.height - y * 2; + width = widget->allocation.width - GTK_CONTAINER (menu_item)->border_width * 2; + height = widget->allocation.height - GTK_CONTAINER (menu_item)->border_width * 2; right_max = x + width; if (widget->state == GTK_STATE_PRELIGHT) -- 2.30.2